sorry, I only wanted to commit .cvsignore

I'm stupid and perhaps a bit tired ...

diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 4545aa370e8f61026baaa204d5ca4e178d846796..d6b770b7249b9c40bc2ae4b9e92f96dce0a26f70 100644 (file)
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -1,7 +1,7 @@
 ## Makefile.am for gtk+/gdk
 
 SUBDIRS=$(gdktarget)
-DIST_SUBDIRS=linux-fb nanox directfb win32 x11
+DIST_SUBDIRS=linux-fb nanox win32 x11
 
 EXTRA_DIST =                   \
        gdkconfig.h.win32       \
@@ -124,16 +124,6 @@ libgdk_x11_include_HEADERS = $(gdk_headers)
 libgdk_x11_1_3_la_SOURCES = $(gdk_c_sources) gdkenumtypes.c
 endif
 
-if USE_DIRECTFB
-libgdk_directfb_includedir = $(includedir)/gtk-2.0/gdk
-
-libgdk_directfb_1_3_la_LIBADD = \
-       $(gtarget)/libgdk-$(gtarget).la 
-
-libgdk_directfb_include_HEADERS = $(gdk_headers)
-libgdk_directfb_1_3_la_SOURCES = $(gdk_c_sources) gdkenumtypes.c
-endif
-
 if USE_NANOX
 libgdk_nanox_includedir = $(includedir)/gtk-2.0/gdk
 
@@ -157,7 +147,7 @@ endif
 # now define the real one to workaround automake's mishandling
 lib_LTLIBRARIES = $(extra)
 
-EXTRA_LTLIBRARIES = libgdk-x11-1.3.la libgdk-nanox-1.3.la libgdk-directfb-1.3.la libgdk-linux-fb-1.3.la
+EXTRA_LTLIBRARIES = libgdk-x11-1.3.la libgdk-nanox-1.3.la libgdk-linux-fb-1.3.la
 
 MAINTAINERCLEANFILES +=
 EXTRA_HEADERS +=

diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index e70311c1d954e37c7ed05d50d20230732db60b37..1e6ec4bcee2a3e11e21383a8bd28064e772dd8df 100644 (file)
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -710,8 +710,6 @@ gdk_window_paint_init_bg (GdkWindow      *window,
 #include "x11/gdkx.h"
 #endif
 
-#ifndef GDK_WINDOWING_DIRECTFB
-
 /**
  * gdk_window_begin_paint_region:
  * @window: a #GdkWindow
@@ -929,8 +927,6 @@ gdk_window_end_paint (GdkWindow *window)
 #endif /* USE_BACKING_STORE */
 }
 
-#endif
-
 static void
 gdk_window_free_paint_stack (GdkWindow *window)
 {

diff --git a/gdk/gdkwindow.h b/gdk/gdkwindow.h
index f125708c123cfaf8c58b8199a4b4f7f07d2826be..2c8d6bab1ce96d1a02aad05424a3ecef83da6b34 100644 (file)
--- a/gdk/gdkwindow.h
+++ b/gdk/gdkwindow.h
@@ -68,8 +68,7 @@ typedef enum
   GDK_WA_COLORMAP = 1 << 5,
   GDK_WA_VISUAL          = 1 << 6,
   GDK_WA_WMCLASS  = 1 << 7,
-  GDK_WA_NOREDIR  = 1 << 8,
-  GDK_WA_ALPHACHANNEL  = 1 << 23  
+  GDK_WA_NOREDIR  = 1 << 8
 } GdkWindowAttributesType;
 
 /* Size restriction enumeration.
@@ -457,9 +456,6 @@ void          gdk_window_unstick         (GdkWindow       *window);
 void          gdk_window_maximize        (GdkWindow       *window);
 void          gdk_window_unmaximize      (GdkWindow       *window);
 
-void          gdk_window_set_opacity     (GdkWindow       *window,
-                                         gdouble          opacity);
-
 void          gdk_window_register_dnd    (GdkWindow       *window);
 
 void gdk_window_begin_resize_drag (GdkWindow     *window,